From: Jason Rumney <jasonr@gnu.org>
Date: Fri, 15 Jan 2010 23:16:26 +0000 (+0800)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8651^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=aca9b8b8f7900976ed4b3d15adfdbb6cb93abab9;p=emacs.git

Merge from trunk
---

aca9b8b8f7900976ed4b3d15adfdbb6cb93abab9